from trunk

diff --cc etc/ChangeLog
Simple merge

diff --cc lisp/ChangeLog
index cf28cd6dfdefe0fb31117c7dfbd16b9502306f2c,1237a19c5c13f07db338fbdaa45d12d7f5903390..528356b6f4abddddc6282db24598db22d48bc869
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,13 -1,6 +1,16 @@@
 +2010-01-14  Kenichi Handa  <handa@m17n.org>
 +
 +      * composite.el (auto-composition-mode): Make it a buffer local
 +      variable (permanent-local).
 +      (auto-composition-function): Set the default value to
 +      auto-compose-chars.
 +      (auto-composition-mode): Make it a simple function, not a minor
 +      mode.
 +      (global-auto-composition-mode): Likewise.
 +      (turn-on-auto-composition-if-enabled): Delete it.
+ 2010-01-13  Karl Fogel  <kfogel@red-bean.com>
+ 
+       * bookmark.el (bookmark-bmenu-execute-deletions): Doc fix (Bug#5276).
  
  2010-01-12  Michael Albinus  <michael.albinus@gmx.de>
  

diff --cc lisp/composite.el
Simple merge

diff --cc src/ChangeLog
index 2ef9ea9eb5a20b52c41e69056628f00365a442e7,e774c13cc15ccbd674f3218ba942652125c09e3c..5f52168676bd1aa2c8733b02842920e357597f39
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,15 -1,27 +1,39 @@@
 +2010-01-14  Kenichi Handa  <handa@m17n.org>
 +
 +      Make auto-composition work on all buffers even if they are
 +      fundamental mode.
 +
 +      * composite.c (Vauto_composition_mode): New variable.
 +      (composition_compute_stop_pos): Check Vauto_composition_mode
 +      instead of Vauto_composition_function.
 +      (composition_adjust_point, Ffind_composition_internal): Likewise.
 +      (syms_of_composite): Declare Lisp variable
 +      "auto-composition-mode" here.
 +
+ 2010-01-13  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * xterm.c (x_term_init): Avoid garbage-collecting the new terminal
+       during call to vendor-specific-keysyms (Bug#5365).
+ 
+ 2010-01-13  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+ 
+       * keyboard.c (input_available_signal) [SYNC_INPUT]:
+       Call SIGNAL_THREAD_CHECK (Bug#5333).
+ 
+       * atimer.c (alarm_signal_handler) [!SYNC_INPUT]:
+       Call SIGNAL_THREAD_CHECK.
+ 
+ 2010-01-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       Try to fix bug#5314.  This is probably not the final word, tho.
+       * buffer.c (Fset_buffer_modified_p): Try and be careful not to modify
+       recent-auto-save-p as a side-effect.
+       * buffer.h (BUF_AUTOSAVE_MODIFF): New macro.
+       * buffer.c (Fkill_buffer, reset_buffer):
+       * editfns.c (Fsubst_char_in_region):
+       * fileio.c (Finsert_file_contents, Fdo_auto_save)
+       (Fset_buffer_auto_saved, Frecent_auto_save_p): Use it.
+ 
  2010-01-13  Kenichi Handa  <handa@m17n.org>
  
        Display buffer name, etc. in mode line by composing correctly.

diff --cc src/composite.c
Simple merge